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

Merge changes from topic "bp-strong" into udc-dev am: 92865c83 am: 2ef3798c am: ff605219 am: 95cbee90

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



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