Merge Android R

Bug: 168057903
Merged-In: Icdb90bf3af72f16e59dee05fea2b4911750a8243
Change-Id: Ida2cb49de492c8a71222ba802065fa63ea5d91fe