Merge "Revert "Avoid changing z-order of overlay layer after resizing...

Merge "Revert "Avoid changing z-order of overlay layer after resizing display"" into udc-qpr-dev am: e7dbfa32 am: 487a61be

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



Change-Id: I40b8a097c13eff3090e7e0816b7409e43ea82433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>