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