Merge "Fix StageCoordinator unexpected onDisplayAreaVanished" am: 7258ba537d am: e102015259 am: 42ace7b2e3

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

Change-Id: Ib1555b1e6530dd01116788397ed3edd5626aaf85