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

Merge changes from topic "am-ce62a806cb5845a98b7dd1cc33ca876d" into udc-dev-plus-aosp am: 3eda599a -s ours

am skip reason: Merged-In Icad3d5f939fcfb894e2038948954bc2735dbe326 with SHA-1 6bf13a85 is already in history

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



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