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

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

Change-Id: If979096f89fb726673a3b0ad61acd96bef788fa4