[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3162e8aa61 -s ours
am skip reason: change_id I2f97c75036ec82748707c78058b9818ea42ae893 with SHA1 1e017ab7c3 is in history

Change-Id: I8ad1c2bbef82aa6417309a2324111988961b96de
tree: 3e4059b0fcf350b58a95cb23e1d4adda48064468
  1. LoopbackApp/