Merge "Include splitting apps when selecting the second app to split" into tm-qpr-dev am: b05e25e911

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

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