automerge: 7557ec1
* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
automerge: 7557ec1
* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...