am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev

* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...