[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 2b584b3c9b -s ours
am skip reason: change_id Iaeb61121f5854bbbc7f762e131be1c1c27d14331 with SHA1 98318494cb is in history

Change-Id: Iea6bb7453542c24c549c2a078810c9b3faacb06e