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

Change-Id: Ie4aff4c08dfe951ce30c344857cd965270a6efe4