[automerger skipped] Merge "Catch SercurityException while reading device...

[automerger skipped] Merge "Catch SercurityException while reading device properties" into tm-qpr-dev am: 2b3b8719 am: 68e6e4ff -s ours am: 240d6326 -s ours am: f43dfaf7 -s ours

am skip reason: Merged-In I204fc4b8bd7af3ca6432bddfe4e82c8f48208daf with SHA-1 274c406e is already in history

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



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