[automerger skipped] Merge "Remove usages of notifyOemHookRawEventForSubscriber" am: 98f5c24b am: 4efca3f9 -s ours
am skip reason: Change-Id I1a4d99d26a7ed59a115d4b76046120536fb4e808 with SHA-1 7c773171 is in history
Change-Id: Ic522d8a95a53525fd974bcb32e2a0d97f714ab3e