Merge Android R

Bug: 168057903
Merged-In: Id72cfafe90e134554fab7d21fa0f94181d68e11d
Change-Id: I45ada78019c2c86558c8941e915d01ed58f8e569