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

Change-Id: Iee76e75331358802cd8d1df14304748ad5066b6c