[automerger skipped] Merge "Allows for system navigation settings to be added dynamically." into 24D1-dev am: b970322d4c
-s ours
am skip reason: Merged-In I2371f3173076172489966728ac69c8767570cd56 with SHA-1 07109c158a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26652790
Change-Id: I956b169703a1c9c6dcd04f334e30b22b78fdda32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: