Merge mainline-release 6664920 to master - DO NOT MERGE am: b363d45769

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

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
tree: e56002cb3a2db4d84093146a2313b3766dfa4055
  1. framework/
  2. OsuLogin/
  3. OWNERS