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

Change-Id: I7d00beaf11d21c53ea4891e8868d609748fca507