am 7987b1a8: Merge "Change suffix UsingSubId to ForSubscriber." into lmp-dev
am 7987b1a8: Merge "Change suffix UsingSubId to ForSubscriber." into lmp-dev

* commit '7987b1a8c91ecfe06d41bda37bf09d6b97dbd272':
  Change suffix UsingSubId to ForSubscriber.

md5555/android_packages_services_Telephony