Merge "Revert "Reduce invocation of surface placement of switching activities"" into sc-dev am: 7f0bca66 am: 0a65c220

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

Change-Id: I31b27d57e038ff79f3cbb1da48353ce36224036b