Merge Android R

Bug: 168057903
Merged-In: I02ad49d6b2c3344b90108ee0933a82bd2244dfd8
Change-Id: I3280e5fc715ebf1fd16e52466236a56f8fb1197c