Merge "Making transitions between gone hosts work better" into rvc-dev am: acd4508f46

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

Change-Id: I0d713ea0032777e9a9e1b0eb8ee2480d6be32256