[automerger skipped] Fix support for USER_ALL in FakeSettings am: ba405b78...

[automerger skipped] Fix support for USER_ALL in FakeSettings am: ba405b78 am: 7ba8c005 -s ours am: 21d23cfe -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: I16fd2601b60fc7f7d9f6f0b624322ee266bee8cc