Merge "Catch exception thrown by SystemProperties.set" into udc-qpr-dev am: 4d8e954273

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23970726

Change-Id: Ie54fdb068d2e60e03fa6856064c407c5d11393b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>