[automerger skipped] Merge "Remove get/set of unused system property...
[automerger skipped] Merge "Remove get/set of unused system property net.ppp.reset-by-timeout" am: d82d8d5f am: a968ae66
am: 67339eec -s ours
am skip reason: change_id I9a01b9a06be4cf543edd55df945a42ee6fa21415 with SHA1 2503a23e is in history
Change-Id: I02d60f762934c9b5ce53bf2c29eb1b38277531d9