[automerger skipped] Merge "Schematize ADB system properties" am: 9e74581c7c -s ours
am: de49496e76

Change-Id: I2acd5f99b16928e028b6629e94af333a9b7bdd1a