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

Merge changes from topic "am-f07ece69339246839591a89404340826" into udc-dev-plus-aosp am: 840ad3be -s ours

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

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



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