Merge "Add free short codes for direct carrier billing and others"
am: 73c50f7dbc

Change-Id: I1c6fbd6107cf7a6819c6d7f42c5639fa029be54f