Merge "Move android.location and android.location2 out of CtsTestStubs" into lmp-dev