Merge "Unhide android.provider.Telephony.Sms.SUB_ID" into lmp-sprout-dev