Merge Android R

Bug: 168057903
Merged-In: I4d1fe63e23fcf4ed5cd9013e2bdf509bc3722525
Change-Id: I66f1ccdd7ff624e131d8b50de28a5465f7c95df7