[automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: 7b84f49b41 am: 3048afdb0a am: db4dc27684 -s ours am: 654b416691 -s ours
am skip reason: Change-Id Iedac8763372ef6f11754d3f272f70753fb3d4829 with SHA-1 091f514bf5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541210
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bebbcfe1da2afbd901360d234b87d9af1767923
This commit is contained in: