Update display_settings.xml to match upstream

Change-Id: I731a0d0aca558dfd6b1b4d9d6cc4767a26886352