Android R Beta 2
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master

Bug: 151763422
Change-Id: I125e1a7d17abd7b12b98ec28fce12f9cb5c466f1