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