Merge "Merge "Added events in UserHalService for metrics" into rvc-dev am:...

Merge "Merge "Added events in UserHalService for metrics" into rvc-dev am: 18db5b5d am: a55168f9" into rvc-d1-dev-plus-aosp am: f7ad20dd am: 5fd48941

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

Change-Id: I70a994244d534a94c09e1f8dfe5d1ea3a97a76a2