[automerger skipped] Merge "Schematize Display system properties" am: b139a4c16b am: 4d8f4919e0
am:b941bc46b5-s ours am skip reason: change_id I83b40ddfcde32d8d03fae73f5c252013933c466c with SHA11a3425ed2ais in history Change-Id: I880ee2758010f1be44e9f24bbc35596fbccea0d8
This commit is contained in: