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

Merge changes from topic "am-a5a0cafc4d984c3d849d6597e5b3680a" into udc-d1-dev-plus-aosp am: 1b156e6a

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



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