Merge Android R

Bug: 168057903
Merged-In: I70c611122b5b5dd92fc7c17a0ef560dcb0efba70
Change-Id: I70df432e9c39f6c197ad919f9031407ec9211706