Merge changes from topic "am-d4cfece650ce479fabf77f5e3b48e97d" into...

Merge changes from topic "am-d4cfece650ce479fabf77f5e3b48e97d" into udc-dev-plus-aosp am: 669fc2f9 am: d387f36c

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



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