Merge changes from topic "cherrypick-cherrypick-sawRevoke-drldh0k6wy-6ocmw7r6v8" into sc-qpr1-dev am: ed367482c5 am: 8b0f35a13f am: b56b721ce8

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

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