[automerger skipped] Schematize Display system properties am: ad0e5a35 am: f3f2b3cc
am: 4d608076 -s ours
am skip reason: change_id I3bd7da88ffc1fafda1aa2ebe1c338d6e7c7e24a8 with SHA1 ca67f85a is in history
Change-Id: If05108053987e6e54730a1c76a5846a0ff3ef2fc