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

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

Change-Id: I9c0d07697a2fc4a4c91b514dee66119e42b50dfd