Merge "Making transitions between gone hosts work better" into rvc-dev am: acd4508f am: 4f8f824b

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

Change-Id: I7716bf30f694ca238da970a599afa6968fd74a60