Merge changes from topic "am-d1c1ce83eff34b6eb6fbf9d9658a8266" into udc-d1-dev-plus-aosp am: 8a167574

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



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