Merge "Remote mCurClientInKeyguard dependency in IMMS" into sc-v2-dev