Merge "Convert tests/tests/{telephony3,telephony4,telephonyprovider}/Android.mk file to Android.bp" am: 8cf9a5e211
am: 086e84cea8

Change-Id: I832bd4cb106bce44dc25105383926bd0fff32142