Merge changes from topic "cherrypicker-L35800000963116081:N91200001406548621"...

Merge changes from topic "cherrypicker-L35800000963116081:N91200001406548621" into udc-qpr-dev am: 77c5cd9a

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



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