Merge changes from topic "cherrypicker-L72500000958763307:N21300001339715669"...

Merge changes from topic "cherrypicker-L72500000958763307:N21300001339715669" into udc-dev am: e02709f4

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



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