Merge "Revert "Adding CTS test for android.location.Location""