Merge "Frameworks: Handle exceptions in SystemProperties callbacks" into pi-dev
am: 837f1364f6  -s ours

Change-Id: I8fc2af180b2916f23c41e4d76e143cf96736ea1e