[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 547b9dc313
am: 50a5d5da7e -s ours
am skip reason: subject contains skip directive

Change-Id: I88fce7b65ac0028b8140f0d07844feca55325151