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