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

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



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