Merge changes from topic "am-ca83f9997d2a42c9b8ac75caa9ef9412" into udc-dev am: 133a3bf3 -s ours

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33 is already in history

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



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