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

Change-Id: If9024df562f32e0d263905f3ef0c2330824b2869