Merge changes from topic "am-e8824716c8424da1bdc8c0129cf578a2" into udc-dev am: 17ba0860 -s ours

am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 af8e64db is already in history

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



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