Merge changes from topic "am-2876cb49a01647d5b9d7e87219b708bf" into udc-dev am: 67b7ac80 -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 820fe895 is already in history

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



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