Merge "Allow other restriction categories" into main am: f51f896438 am: 6bf843cd90

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2980372

Change-Id: I83561fb4345eec309da933cd4c936d29efa2d7ac
Signed-off-by: Automerger Merge Worker <[email protected]>