DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: If031ceec4c449b2dd5a7f6516fa5faa3d880b144
Change-Id: I968b58bad6eae85510a3374d30570e7f5be1e7c0