Merge Android R

Bug: 168057903
Merged-In: Ia938e70f256d6d9b9c80f056cb473c8803257e27
Change-Id: I12d518fd24eb65ad597dbbdd339a620d9ab9ca9b