Merge "Revert "Migrating SettingsLib tests to /external/robolectic."" into udc-qpr-dev