[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 673f9011ee -s ours

am skip reason: subject contains skip directive

Change-Id: Id9ef32eff92c90b70e6a2414fbb98006e1d1566c