Merge "Fix StageCoordinator unexpected onDisplayAreaVanished" am: 7258ba537d

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

Change-Id: I06310275cae07918c046407f4b92a06023201c60