Merge "Another setting.pkg null check" into rvc-dev am: 171f5f28 am:...

Merge "Another setting.pkg null check" into rvc-dev am: 171f5f28 am: 38c4e953 am: 285a1366 am: 265cac25

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

Change-Id: I1b8cab5ee48fe8b17dc1c4aaf380fa7530c5cdd4