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