[automerger skipped] Update TelephonyProvider to add group ID. am: c5630dd236 am: aa79233e88
am: 42aed87b95  -s ours

Change-Id: I16ca14534679ce87d0d90d9bb1ff267f0d724126