[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: e13851556b am: 128dd4c416 -s ours
am skip reason: subject contains skip directive

Change-Id: I8cd5a78633d18b734a7232794ce24f49b0a964df