Merge Android R

Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
tree: b4fe986b0e293d511c6b0876c45f3d2c812ad546
  1. framework/
  2. OsuLogin/
  3. OWNERS