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

Bug: 142003500
Change-Id: If0acf62f1292e91f3251bbb3d0b29d5ce62d710e