Merge changes from topic "am-24d669f090ff4a82b5a941e0f950c814" into udc-dev am: a21486cc -s ours

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

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



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