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

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

Change-Id: I1cf48bea5d20a323a2d7c50a63bb122bdc04ac8d