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

Change-Id: I1ef03233ba8cc7975698739718579bf72fda80dc