Merge "Handle onUnlockUser on fg thread" into oc-mr1-dev am: 02fbb07f22
am: 7dcdd4aed1

Change-Id: Ia353a6f4ff073c2cb4879f372cf659192f644cf8