Merge changes from topic "am-135190fb80e84a5ab722798ba75fc2ed" into udc-dev am: 7fcd7c4b -s ours

am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 bbc68b5a is already in history

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



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