Merge "Fix showing CallingAccountSelector in lock screen"
am: 8bfd9a8caa

Change-Id: I237a467a72fd7aa40192c1ce7d1e0454966e14ea