Merge changes from topic "am-e66d5989b6844d95b2acd5b3553d1017" into udc-dev am: 0c233eb4 am: 55037894

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



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