Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 72459e4a0e

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

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