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

Change-Id: Ibed559afb18aacdd048d8391dd6963af7c40354d