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

[automerger skipped] Fix support for USER_ALL in FakeSettings am: ba405b78 -s ours am: 18e5c5a7 -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: I2831f89afb14db820dcc6d3c0884a84b0500cd2d