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

Merge changes from topic "am-f1c267f812574dcaa9fa1cfeb05f90e8" into udc-d1-dev-plus-aosp am: f18767b0

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



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