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