[automerger skipped] Merge "Schematize Display system properties" am: db5c59214f am: e3f4f5eedb
am: 6b419380e3 -s ours
am skip reason: change_id Id9bbb997669b05b6edb5307d561e766ead19abf1 with SHA1 0fe161dffd is in history

Change-Id: I0b89a0ed972e9afe308b55f641ca9cd5cb194349