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

Change-Id: If3b29562149233c8246e37b810a675004586e982