Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35
am: 67556fac04
am: c1bd6bc6e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040 Change-Id: I1cc6513a2e86295b9547b03796e826c430a19cbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: