Merge changes from topic "am-3c20e42f358647e7b6ffec61aad327a3" into udc-dev am: 376f9193 -s ours

am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 8269f703 is already in history

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



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