Merge "Frameworks: Handle exceptions in SystemProperties callbacks" am: af3dc4fc70
am: bccdf32c8a

Change-Id: Ie640cf1734ff80a19d8c0ba65734f5e76d26fa76