Android R Beta 3
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 112664b4ad

Change-Id: Ida722171e070568e33c257ca93c682a8208a9d49