Merge "Modify Action Bar for Telephony Call Settings so they match Dialer" into lmp-dev