Snap for 6330721 from c8cc772603ab682d54e2573b19889afd491060f5 to mainline-release

Change-Id: I818a887e680dd48137b85bb2354717a329e541d6
tree: 3c7a65604f6f280fab1ff99f9317c537549c19ab
  1. framework/
  2. OsuLogin/
  3. OWNERS