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

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

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