[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 2d0968363c -s ours am: 3ab4edf383 am: 3539fde64d
am: b1b097aac9 -s ours
am skip reason: subject contains skip directive

Change-Id: I67aaaa8b17870613aac1055270eceecf02f94a92