Merge Android R

Bug: 168057903
Merged-In: I609894770235673dc005d118062b9f8b4af08ba8
Change-Id: I952771c07e35e8bd48412afa45df09228854dc29