Merge changes from topic "aris-backport-rvc-dev" into rvc-dev am: b612e74dc0 am: 617829cfd5 am: 3086ddc5db am: 998e741c3c am: dbfff4117c am: cfc1526aac am: dd4c9e8255 am: ea4c363383
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611410 Change-Id: I5ff2927a2c7b00182c7dd017f0fc62ae7ecd7b62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: