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

[automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: 7b84f49b am: 3048afdb am: db4dc276 -s ours am: 654b4166 -s ours

am skip reason: Change-Id Iedac8763372ef6f11754d3f272f70753fb3d4829 with SHA-1 091f514b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541210

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27f7b77ba0cb16648fba015dda81e51ed4c1c8d2