Merge "Add remaining hyp events" am: 8cf32c3b am: 34ffc848 am: 85244e2d...

Merge "Add remaining hyp events" am: 8cf32c3b am: 34ffc848 am: 85244e2d am: e32fafd3 am: 6dce659e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2480818



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