[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

Change-Id: Ib43e6439d0cca4e64f4f6a867096757ae2c0190b