Merge Android R

Bug: 168057903
Merged-In: I3d367a3babc9cb7ac6dbea396f70e10c5651d50b
Change-Id: I014692bdf83a0cdc7d5eeabb0747538c3eb798bc