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

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



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