Merge "Move android.app Activities into com.android.cts.app.stub" into lmp-dev