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

Merge changes from topic "bp-strong" into udc-dev am: 92865c83 am: 2f814e50 am: a9f63ec9 am: e3334362

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



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