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

Change-Id: Iee34f00cb212f2a928cf7e0b40c7cbd55252d737