[automerger skipped] Merge "Handle user consent denial sooner" am: 62b3ec5981 am: 97f1721bd4
am: dd6817feb9 -s ours
am skip reason: change_id Icbed7c510ff9c9a882a7b49eac1a92fa17727635 with SHA1 5c39003abe is in history

Change-Id: I04b0e4e56a3900502c148466285e3d7685bae426