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

Change-Id: Ib2581c0626d0f89c70dd04671bb15dd9d51ad1a7