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

Bug: 151763422
Change-Id: Id0255ba667e8282a3647ce990fde3784357fe095