[automerger skipped] Merge "Schematize ADB system properties"
am: 9e74581c7c -s ours
am skip reason: SHA1 9e74581c7c skipped by user kiyoungkim

Change-Id: Ib3fded632f3bbbd26e4b691ba2399ddeecd5023e