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