Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG: 36552859" into oc-dev am: 500c1d0749
am: 3c68867864

Change-Id: I3233a604cda1ca48fad524b5c02d54847d67cfc0