[automerger skipped] Merge "Merge Android R...

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 15144fd1 -s ours am: fcff35f4 -s ours

am skip reason: Change-Id Id18cb0e2d2f3e776a42b566c4a1af2e250890896 with SHA-1 8ac68188 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12484875

Change-Id: I44d2d5896fe5ca40f2b59f9ba97d92a3652e5059