Merge changes from topic "am-6dd2ccf1b0f846c3ad2dda31b11fee04" into udc-dev am: 0877410a

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



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