[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release. am: a65666a

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

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

Author: Android Build Coastguard Worker