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