Merge "Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d
am: 6fdc3745c3" into qt-qpr1-dev-plus-aosp
am: 6d3614f8f0
Change-Id: I96abb2f6f27544b8ad5f508b7d8c7f26249bd9a3
This commit is contained in: