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

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

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



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