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

Bug: 142003500
Change-Id: I6b02ee21e0b6ab30edf51e565b8b224c7a04ce92