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

Change-Id: I56aa0aec08faab903adc1e7fc4267a7ed6be201a