DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ib81ba3288a986546bc570c3759c55d026add591a
Change-Id: I2acfeb6cfc83a80056a685355cc367a5514da069
tree: f4e04c5f7d6a9b363a79aee643864fd4bf42bb9b
  1. framework/
  2. OsuLogin/
  3. OWNERS