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

Change-Id: I31a24ffd3834839da5aafb9419d7480febbb4bde