[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 4b943499d0 -s ours
am skip reason: change_id I74e378c19586cb1d32088a8444f47595ad0ecdd7 with SHA1 af79780ac6 is in history

Change-Id: I299f1c34c4952dff85928103499bb479131b3489