Merge changes from topic "am-733a5c7406264a459a0a2894b8b96d63" into...

Merge changes from topic "am-733a5c7406264a459a0a2894b8b96d63" into udc-d1-dev-plus-aosp am: 40a6a3fe

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



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