Merge changes from topic "aris-backport-rvc-dev" into rvc-dev am: b612e74d

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



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