DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I3ac4b2fbe44ba6a7d207c37e1dac072366efa806
Change-Id: I89e6b9edd14e1f93e8230c74bbce0c8324c34e33