Merge "Fixes un-setting activity type when embed activity in split-screen"...

Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev am: 0fb7a128

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



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