Merge "Fix NullPointerException to get sim accounts" am: 8b70a6bfad am: 78522e8931

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

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