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 am: 9b9c7f11 am: 2c4fcfd4 am: f58fd072

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



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