Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc...

Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc am: e941740b am: 67556fac am: c1bd6bc6

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>