Merge "[automerger skipped] Fix support for USER_ALL in FakeSettings am: ba405b78 am: 7ba8c005 -s ours am: 21d23cfe -s ours"