Merge "Do not remove/hide surface when waiting for transition start" into...

Merge "Do not remove/hide surface when waiting for transition start" into sc-v2-dev am: 4650065c am: 67d7acf0

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

Change-Id: I8fa034347f64a1ff8e742d978603257c63a68f6d