Merge Android R

Bug: 168057903
Merged-In: I8c5ee0f658f8387fecfef7c4d977fa12e094d3ae
Change-Id: I371263745240bb63986965b7e9b3720c66e1ddcb