Merge changes from topic "fix-atm-visibility-issues"

* changes:
  Add android.test.mock.stubs-system
  Fix visibility issues with android.test.mock.stubs