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

Change-Id: I5ef9291bd9cc2d33c50e3fac2e8cafb46922de87