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

Merge "Avoid changing z-order of overlay layer after resizing display" into udc-qpr-dev am: bf1b4aa1 am: 31241c3c

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



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