Merge changes from topic "cherrypicker-L76800000958796731:N60400001340845132"...

Merge changes from topic "cherrypicker-L76800000958796731:N60400001340845132" into udc-dev am: 83f5395c

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



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