am 5a8b2c3b: am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-dev

* commit '5a8b2c3bc632683e7651132aff3b28e1fc763165':