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

Bug: 151763422
Change-Id: I9d6fa2be3c61e59d9d7299ac37f01fc707e8932c