Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 2342f0d1cf am: f01b99332b

Change-Id: I3bc4f4e9dbe6e735c154338ab641b56e7c6ad027
tree: 6954a3a33c76020ee1bd7d7d759049bb62342c72
  1. framework/
  2. OsuLogin/
  3. OWNERS