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

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

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