Merge changes from topic "am-d7a5ff95da48432a9e62e600f6f116dd" into udc-dev am: 4e7fc86f -s ours

am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 39b4b1e9 is already in history

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



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