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

Change-Id: I799022c5234f036b0eb0d1cc69f4829b63d52497