Merge changes from topic "cherrypicker-L06600000959260644:N82800001349763665"...

Merge changes from topic "cherrypicker-L06600000959260644:N82800001349763665" into udc-dev am: 05ee5fc9

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



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