Merge "Changes to APIs for CarrierRestrictionRules class" am: 6d9dd94da0 am: 5654a52322
am: 3d35392cee

Change-Id: Iadbe8373de40af780de89beba3b8a393deb8e1e6