[automerger skipped] Merge "Do not use hidden API SystemProperties.set" am: 622cf3787d am: 7b8c432e83
am: 6a140ddc37 -s ours
am skip reason: change_id I7576cbea559ac9d5411f470182f0c0f2f7ce675d with SHA1 4c5f4f28a0 is in history

Change-Id: Iad389cf1d5918ea91d9c6cdfefd08ad384f3fa51