[coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L55900000958663479 into tm-qpr2-release. am: 0bc42c4

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

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

Author: Android Build Coastguard Worker