[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: ec49b75d0a -s ours am: 0dc3400c43 -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: I47087cabc2093c6de6116f11f660aa624dcb260e
tree: fb1320bec3ded6d2f373570b5d8cfe44cef4f232
  1. framework/
  2. OsuLogin/
  3. OWNERS