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

Bug: 151763422
Change-Id: I37d0e207a84aaedf24620e485ff1349463d6d118