[automerger skipped] Merge "Remote mCurClientInKeyguard dependency in IMMS"...

[automerger skipped] Merge "Remote mCurClientInKeyguard dependency in IMMS" into sc-v2-dev am: 53a2aa20 am: a2401e93 -s ours

am skip reason: Merged-In I24c511d068ab371d6984201327a561322fc26bd8 with SHA-1 1e5c277f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16324233

Change-Id: I293eae7ce0a8bf551b8c43ae0c6279a5cd9c4a46