Merge "Catch SSE when no subId is loaded" am: cc3f4cc083

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

Change-Id: Ibda753abec714576986b5ca94e65eb64091d1e26