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

Change-Id: I51c05e157d4eaa9eb00350449748ea0db89d7623