DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: Ic09ec330f4f7bf47c5ca7c71fa268da16ccba3a2