am 3f1b5c52: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
am 3f1b5c52: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev

* commit '3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7':
  The public Telephony APIs must be present in all Android products

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build