Merge "[MS71] Remove remaining dependencies in SettingsLib" am: 018ba8116f am: c5c8269604

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

Change-Id: Ib1e536c1b2f8c7bc36993ab9cb9f14613c131ec8