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

Change-Id: I97afd99b91d7c0dbafa38cf4c6fa6b044890b7f3