Merge "Count app restriction events" into udc-dev am: f0fe79de am: 7b8cee80 am: 2089f33c am: 50172a22

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23047553



Change-Id: I5cf13a3c9810924ad67eec87a68ea531809a7f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>