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

Change-Id: Ib53d505628137df41f5a687dba5e879479e086aa