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

Change-Id: Iba0a5f1b46819c20209dc3afcb2ecaf1cc3ab209