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

Change-Id: I7b4190416bfba88e7a9d974b9732e7c8c2f05526