Merge "Remove getDisplayCountry test for MK. [Q CTS]" into android10-tests-dev