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

Change-Id: I17fe65b18e987659f0c6da133ef3789cb403aa1c