Android p preview 4
Merge "Use a.t.mock.stubs instead of a.t.mock.sdk"