Merge "Fix resource not found when placing call outside dialer" am: 0e029e7f6d
am: 254649f0ad

Change-Id: I208980fd8a0378a921c5890bf4e199ef48aeabb5