Merge "Restrict fields supported by SimAccountType" into ub-contactsdialer-g-dev
am: f639b7c673

Change-Id: I5916051ca9bb0a288ba12d8ac11ad0317d9928d0