Merge changes from topic "am-b18a759980174b6e90933fb593715281" into udc-d1-dev-plus-aosp am: e197ff2a

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



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