DO NOT MERGE: Move FakeSettingsProvider to a common location. am: 4166a1fcfa -s ours am: a84ede299c -s ours
am: ab28abf325
Change-Id: I3e877a603c1c19af15e5f38d4e0301dfddfc6f39
This commit is contained in: