Merge "Move android.provider out of CtsTestStubs" into lmp-dev