Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640"...

Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640" into sc-qpr1-dev am: 7fdc711c am: cf8dcd28 am: f2e055c7

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



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