DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Idf8e64fd9e678de688b7a2ad40e0dd74ec146a1b
Change-Id: I812233682f0c72e2480395214caeb76ba3754d68