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

Change-Id: I8aafe53c153f03ca098e54516fff0dfedfb3944c