Fortunately, there was a fix made last year in version 21.0.1 of the play-services-location library. To leverage this fix, I added the following line in my android > build.gradle:

buildscript { ext { .... playServicesLocationVersion = "21.0.1". <----- ADD THIS LINE }