DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I7499e0c6e6d7b1c771196c88b8bb898cd61e77dc
Change-Id: Ic199ddf3a239d41ed7061aadda84976aff29f66c