[automerger skipped] Allows for system navigation settings to be added dynamically. am: 9aa1c402ae
-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: If61560fb538ce520cf0241b8b5cffe27e2f610aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: