[automerger skipped] Do not request cancel authentication unless currently...

[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d076 -s ours am: 587d8d70 -s ours am: 32a9b548 -s ours
am: adb95d23 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a is in history

Change-Id: Iac98d7bba6163e332414cef5e3a1f2f8dbe96cc9