Merge "disable carrier actions on redirection by default" into oc-mr1-dev
am: 5bed401148

Change-Id: Ie7fc58959699716fc3bd25dfa67a9f1567452009