Move android.location and android.location2 out of CtsTestStubs

Also add android.location2 back to CTS

bug: 17397943
Change-Id: I98ee36679cd6bd0cf0a8d1b53ea5bbba3bc2a957
3 files changed