Merge "Catch SercurityException while reading device properties" into tm-qpr-dev am: 2b3b8719

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



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