Merge "Catch SSE when no subId is loaded" am: cc3f4cc083 am: 317c552a80 am: 0295cca6a4

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

Change-Id: Idfe41d583559fffba298635e93a992e2651d8f01