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

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

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