Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11d9849150aac649b704cfa129256deba6ac862b