Merge changes from topic "am-f32534b9ec8d42ea9d3a53d84c0df9b2" into udc-d1-dev-plus-aosp am: 4443cc03

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



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