Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager." am: 6d0f1eff8b
am: dbd2972e6c  -s ours

Change-Id: I0af5402a8854d87b20fc920a7432322222c4ade1