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

Change-Id: I6df83c2fed6f9f91451c37a49244baff78c03347