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

Change-Id: Ifc446983451f59c7dc523167f80bc5b74afdb58d