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

Bug: 142003500
Change-Id: I9bfd101c80c3d15618407a1a69aa58cf44ab7c1f