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

Change-Id: I8d40d3f9087132720ec7e91645511d452f6125f8