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

Merge "Fixes re-setting activity type when embed activity in split-screen" into sc-v2-dev am: 35eaf77b am: e1f23176

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

Change-Id: Ib72c8deca58c589d12ca05cc6bb3883207bbf6c1