Merge "Reduce invocation of surface placement of switching activities" into sc-dev am: 63a50896 am: b945e7ad am: 289ec56b

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

Change-Id: I774ec84cc0f5ea2639b7ebb80e0207206db0f08b