[automerger skipped] Merge changes I7d98ab42,I8753e681 into rvc-dev am:...

[automerger skipped] Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d am: 8392b1b8 am: 6add7f27 am: f2aac369 -s ours

am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 10dc347f is in history

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

Change-Id: I133fda6c970f1ef30f871b4d30803bec08bd3b7b