[automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am:...

[automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: df58c650 am: 7ac7030d am: 06bf3f19 -s ours am: bf238d46 -s ours am: 4dd8e3af -s ours

am skip reason: Change-Id Ib6b450489c63913c47858cf295e4785fd5d0cfbb with SHA-1 a366690d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c6d18fedab2d22098cb86de1d89b0e840755cbf