[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 5487e82df5 -s ours am: 4117bb8201 am: 263d196387
am: 97dfdf3654 -s ours
am skip reason: subject contains skip directive

Change-Id: I5e8f5f57c3d4d14fdf54d5c1380a98764d694874