Android R Preview 4 (RPP4.200409.015)
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 4e8f1845d5

Change-Id: I9878f486baa3549a0096f27576e5f4342c4c8846