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