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

Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc am: e941740b" into tm-d1-dev-plus-aosp am: 0366a838

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



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