[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 9ace52f670
am: 0d71c83b89 -s ours
am skip reason: subject contains skip directive

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