Merge "Migrated various apps under packages/services/Telephony/testapps  to androidx"