[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: fa91357ae2 -s ours am: 77ae6ac2b9
am: 899e4c6455

Change-Id: I162c100336bd927e33a83d97ad520566ee0565d1