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

[automerger skipped] Merge "Merge Android R" am: 8ac6741e -s ours am: b9db5b54 -s ours am: a9f9ccbc -s ours am: 8db74914 -s ours am: a0c91172 -s ours

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

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

Change-Id: Iaa8c8357dffc8b79db12607cf6bf182ed6a62e74