[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 4717ca5721 -s ours
am: f5d1330bac

Change-Id: I10419d3b272c5ef7a152510de59d42e88505838e