Merge changes from topic "am-08d0df54275d4be69bd77cdf4d6f7551" into udc-dev am: 5026b3d1

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



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