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

Change-Id: Ida2e14daba5dc5abfec59b55626e204973911424