Merge Android R

Bug: 168057903
Merged-In: I3ee1855cba8f1f2f19dd99307d4d527903f93749
Change-Id: I765eb50e47838d03504cb989e748051bf1fa40a1