Merge "Waiting for snapshot layer gone for quick switch tests." into tm-dev am: 801c0b17 am: 1046e93a

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

Change-Id: Ie9dd556c045b1d6e97f49490a3764b19ad5df268