Merge "Merge "Add get/set user selected outgoing phone account APIs." am: bf100363 am: 6e7caec9 am: 5797bc59"