Merge changes from topic "bp-strong" into udc-dev am: 92865c83 am: 5ebf2399

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



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