Merge "Fix NullPointerException to get sim accounts" am: 8b70a6bf am: 78522e89 am: f85eb899

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



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