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

Change-Id: I4f32e28b9754bc85c22333fd9a3b0188c35cd291