Merge changes from topic "am-ab58696cdb0e4c62b510a69ede6823b0" into...

Merge changes from topic "am-ab58696cdb0e4c62b510a69ede6823b0" into udc-dev-plus-aosp am: 22bed66b

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



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