[automerger skipped] Fix support for USER_ALL in FakeSettings am: ba405b78 -s ours am: 18e5c5a7 -s ours am: 04737a9c -s ours

am skip reason: Merged-In I41a0eb50a2cd1700b03b372bfcc199bebd9aea35 with SHA-1 59a168a9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15545837

Change-Id: I4fb93a13c2b5810d29f7afc6888c0b80bf4aebc9