[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: 3b0fdeda37
am: 35359a0720 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c5867113d6de61c935b4f2b665da88f004cf62c