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

Merge "Making transitions between gone hosts work better" into rvc-dev am: acd4508f am: 0a929e3e am: 40edfbe1

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

Change-Id: I15e17ae970f1f54e6fc706f2e41038cbc23cbc6f