[automerger skipped] Merge "Merge Android R" am: 8484c0a7 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 8484c0a7 -s ours am: a0b08173 -s ours am: b0a9a3b2 -s ours

am skip reason: Change-Id I88f6774ca9985fb50f015756b8f8508d4691dc62 with SHA-1 cec1c89a is in history

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

Change-Id: I9fe28ba57dcea4cba69343e44ba4971e19432bcc