Merge changes from topic "bmm-events" into udc-qpr-dev am: 6f4c93a57a am: 933caefe55

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

Change-Id: I27c8b8db185a3650cbfc40d15d044560b16ea6b4
Signed-off-by: Automerger Merge Worker <[email protected]>