Merge changes from topic "am-357fc7603d464176949fe70560788ae2" into udc-dev-plus-aosp am: a9f06ea7

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



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