Merge "Move JUnit tests not from telephony settings into legacy directory."