Merge "Fix unnecessary relaunches when unlocking with fingerprint sensor." into oc-dev
am: c6700cac67

Change-Id: I3348e1eaefa0107bee5fa6e3fcc94fe4eb7dd8c3