[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 08c3df80ef -s ours

am skip reason: subject contains skip directive

Change-Id: Ic940baadb58a0f44bed035fbeb77634f2312a5b4