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: 31918e91 am: 5e22f854 am: 70e9cf7d

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



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