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

Change-Id: Ib905a364793b97e2a49c632745a5af2392168f99