Merge "Catch a resource not found exception" into sc-v2-dev am: 541f0e447f am: db744aaa66

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16075735

Change-Id: I0a8ca619d677dc95e8614934dcd9830d21c93ccf