Merge "Merge "Fixed the Premium SMS bug reported by our partner The detail is...

Merge "Merge "Fixed the Premium SMS bug reported by our partner The detail is that : ===  <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}"  is added to all similar entries BUG:66911380" am: e2e7b28c am: 6c0c7961" into pi-dev-plus-aosp
am: ccba499e

Change-Id: I7b74b256700a033a49f66206ab57c8774763660d