Merge changes from topic...

Merge changes from topic "cherrypick-cherrypick-sawRevoke-drldh0k6wy-6ocmw7r6v8" into sc-qpr1-dev am: ed367482 am: 8b0f35a1

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



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