Merge changes from topic "am-6dd2ccf1b0f846c3ad2dda31b11fee04" into udc-dev...

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

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



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