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: 88b16a7b am: 12b3c6d2

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



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