Merge "Add remaining hyp events" am: 8cf32c3b44

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

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