Merge changes from topic "am-1adf8690a2ed4070a4b68539ca370031" into udc-dev am: ab8ed718 -s ours

am skip reason: Merged-In Id827b3e253b637273504d87c8db64893c7b70924 with SHA-1 ffc4b56c is already in history

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



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