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