[automerger skipped] Merge "Schematize ADB system properties" am: 9e74581c7c -s ours am: de49496e76
am: 180c7e6d16 -s ours
am skip reason: change_id I654c0e1f234d097a66f79ba8c019b8bebc794816 with SHA1 d8849f0351 is in history

Change-Id: I98cbcb39556dc739a23bed6c063f28a9f5a78507