Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8
-s ours am: e39bcb6bf5
-s ours
am: eef095d0ee
-s ours
Change-Id: I14bd887cac26c0b3ced671d971f4d059a061088d
This commit is contained in: