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

Bug: 142003500
Change-Id: I2d8f6262c1b44cfcd24e5bb7fb8b584e81c4a7ca