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

Change-Id: If564d0fccc8f3dd23a37804985429a291ec8f303