Merge "[automerger skipped] Fix support for USER_ALL in FakeSettings am: ba405b787b am: 7ba8c00584 -s ours am: 21d23cfe50 -s ours"