Merge "Fix split caused apps ANR" into sc-v2-dev am: ffc8cceadf am: 960c4e1d45

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

Change-Id: Ia880bf1623760e0142577641c5565683359d0a32