Merge Android R

Bug: 168057903
Merged-In: If92e9b343745d18dc001847da8d7f061ae52ea52
Change-Id: Idb37b3664ce66fe05ab807b0484f464e46d9d41a
tree: ac2076e2d3513410f5b4fd7094a5c887161b314f
  1. 29/
  2. 30/
  3. S/
  4. OWNERS