Merge "Count app restriction events" into udc-dev am: f0fe79de am:...

Merge "Count app restriction events" into udc-dev am: f0fe79de am: 26177ec1 am: c266baca am: 1db93847

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



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