DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I55c1e41284c66ea3ee9ea53ea1eab878bb48148f
Change-Id: Ia5b02776fc836f0ec74d162bae6e2668d5f8d06b