[automerger skipped] Merge "[Telephony mainline] Move all METHOD_* constants from SystemContract to BlockedNumberContract" am: ce18139789 am: de94523c11
am: 6347de57fa -s ours
am skip reason: change_id I5c4380f9343fa50f469dc59a54900bbdc6ea3693 with SHA1 62747b128f is in history

Change-Id: I0867ba7b4acbdb4683c937adcdde276536bf5c25