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

Bug: 151763422
Change-Id: Ia2852ede17b54f672dfd725f1f38965a0f7ccb30