Merge "Use the icon size of starting surface for split decor" into tm-dev am:...

Merge "Use the icon size of starting surface for split decor" into tm-dev am: dc7c91de am: c824ebd4

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



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