[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 80860803a4 -s ours am: 0e80b14588
am: 820c2a5a51

Change-Id: I7b5e79f8f84e32164a42ff300af96b7d61fc4037