DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ia0de45a302aabac7e90b1c1f8560199cd69b0238
Change-Id: I7ee57aa9902ecd0ee9e1e9abda145ef240e59301