Merge "Fix a crash when starting a service in the isolated split" into sc-dev am: bf53e16e

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

Change-Id: Id424e33da4973f85348374a8c3c31d87beada40c