Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into...

Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: 4f2fe7ee am: b9e8f87c

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



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