Merge changes from topic "am-eed5a7c0605b4dc8b00e2aee08dec5bc" into udc-dev-plus-aosp am: f027df74 am: 9b8a0a94

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



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