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