Merge "Retry auth during tap on lock screen." into qt-r1-dev am: f67706c43a
am: fd3e44fdc5

Change-Id: I18947413cae13937f886b7363d3a9d37281ece2b