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

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

Change-Id: Ic81c7001af5ca552dbc1e29ed62ca1f677bbba58