Merge changes from topic "am-b1bf76db508c4b18bd80ee7bd5acca11" into udc-dev am: 1b41718a -s ours

am skip reason: Merged-In I47ce9fdf5429795cbf083516c19b669bc407d1da with SHA-1 d98e95c7 is already in history. Merged-In was found from reverted change.

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

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



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