Merge Android R

Bug: 168057903
Merged-In: I6a389399d923fbb7853d99358d60a20dd85837d4
Change-Id: I1cb96400c470ba75d5667b7b9aee1f4c60354b4e