Merge changes from topic "am-e1949cb4ee104208b7a4b9b0a522d8af" into udc-d1-dev-plus-aosp am: f67de84d

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



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