[coastguard skipped] Merge sparse cherrypicks from sparse-9608475-L41300000958690509 into tm-qpr2-release. am: 50083c2

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

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

Author: Android Build Coastguard Worker