Merge "Remove @hide from builder of CarrierRestrictionRules" am: 0299ff6fa5
am: f4e40a5cc0

Change-Id: I6c400bce18f28f9422e170b4064dde991bcc731f