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

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



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