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

Change-Id: I5af050a76d2d6574aab07059140618be0cfc374b