[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 5e0b0142 -s ours

am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae