Merge "Fix launch failed when split non-resizable app" into tm-qpr-dev am:...

Merge "Fix launch failed when split non-resizable app" into tm-qpr-dev am: 0bee0bb8 am: 56608853 am: a2abc8fb

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



Change-Id: I09556061f0bf27ad36ac0abcc07c3e10b0c0e93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>