Merge changes from topic "cherrypicker-L19100000960963656:N27300001373608395"...

Merge changes from topic "cherrypicker-L19100000960963656:N27300001373608395" into udc-qpr-dev am: f3c15c80

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



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