Android R Preview 1 (RPP1.200123.016)
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I7df7c8b4d93f03bfa803fa6e025b5a0141afbead