Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev am: 79ffe1cc am: be8a2737 am: ce18dfc3 am: 8801ab4b

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



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