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

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

Change-Id: I8b5b739a7dc3c50846c3fe8880329e40717e09ed