[automerger skipped] resolve merge conflicts of 94c54dce to qt-r1-dev-plus-aosp am: fdba62be
am: 6df83350 -s ours
am skip reason: change_id I7812db716ca42055caa70385c71a90de49fc1afc with SHA1 0bbb2a1e is in history
Change-Id: I66a7e47c7a6dde1a66e7bda714beae29353618dd