Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev
am: 39efd4ec44

Change-Id: Ic059dc659f8e32a64c5fa018f48ce0470c64ccd8