[coastguard skipped] Merge sparse cherrypicks from sparse-10216780-L32300000960937408 into tm-qpr3-release. am: e8effbd

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

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

Author: Android Build Coastguard Worker