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

Change-Id: I3661f58c14cc3e1ed061aaba4b49031e9958dca2