[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 9d4836695d
am: 4420a69542
-s ours
am skip reason: subject contains skip directive Change-Id: I44162b30bac345814ea97364c56d69deeea7ca4fgugelfrei
commit
2444b65195