[automerger skipped] Merge "Cancel outstanding user consent request" into...
[automerger skipped] Merge "Cancel outstanding user consent request" into qt-dev am: 9d41bd7c -s ours
am: 7b467877 -s ours
am skip reason: change_id Idd8cd2a62977ad592db9caf3febe89dd9917203f with SHA1 5762741b is in history
Change-Id: I662d309db7fad110e5dc0872c70ec7ea619bd03c