Merge changes from topic "am-756e7c68ca1d489f9d18155adab20776" into...

Merge changes from topic "am-756e7c68ca1d489f9d18155adab20776" into udc-d1-dev-plus-aosp am: 9dca4009 am: fdacbc5e

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



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