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

Change-Id: I26c9e50210c6918baba258af16fa7b75a6690dad