[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b363d45769 am: 2e8a4f4fc2 -s ours am: 6f6158c057 -s ours am: f682d85982 -s ours

am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b
tree: ee26452d586570727ed2d629f060e637aa9ab3d7
  1. framework/
  2. OsuLogin/
  3. OWNERS