Simplify settings package and a few more classes using DI#6778

mrober merged 4 commits intomainfirebase/firebase-android-sdk:mainfrom

mrober/settingsdifirebase/firebase-android-sdk:mrober/settingsdiCopy head branch name to clipboard