Merge "Remove unused constant from TelephonyIntents." into lmp-dev