GmsCore is casting to a concrete subclass, sigh.

Since this technically wasn't an API change, there isn't a good
reason to protect with target API.  So change the behavior based on
the caller for now.

Bug: 26438049
Change-Id: I65aa1fc9af1f935544f8e191444440af4f98f26f