Merge "Merge "Fix error message: getAllowedCarriers" am: 112d039dfb am: 03f4a0f034 am: 96b140489c" into oc-dev-plus-aosp