[automerger skipped] Merge "Schematize ADB system properties" am: 750b90a22b
am: 974ace22f9
am:de1971d7a0
-s ours am skip reason: change_id Iec37f5f35b1452afdf7b15e9f31c4b4726127065 with SHA137bd3482ca
is in history Change-Id: Ic69304743c51cb1c07d20ce8d60f8d1c3f269a42
This commit is contained in: