Merge Android R

Bug: 168057903
Merged-In: Ibc9182f24b151d65d15559af96a2039cf076d380
Change-Id: I6d0e0c8cd9df40d16cf6abf0dccf3e23ca0eb24e