[automerger skipped] Merge "Schematize ADB system properties" into stage-aosp-master
am:dcc7fb2198-s ours am skip reason: change_id I654c0e1f234d097a66f79ba8c019b8bebc794816 with SHA11470f025f5is in history Change-Id: I577f4d5e592e0f9eab19e6c7e6598e5bbf6faa51
This commit is contained in: