Merge "Count app restriction events" into udc-dev am: f0fe79de am: 7b8cee80 am: bfa055d2 am: 0ea336ed

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



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