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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040



Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>