Merge "[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours am: 9f395fd0a9 -s ours
am:dc0a2a6100-s ours am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA10a33d62a17is in history Change-Id: I28c41ce475809b99b0a893a86761abcf47214a71
This commit is contained in: