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

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



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