[automerger skipped] Merge "Avoid changing resolution by display mode when...

[automerger skipped] Merge "Avoid changing resolution by display mode when animating" into tm-qpr-dev am: fee1295f am: a0dfc775 -s ours

am skip reason: Merged-In I5b3ddbc8278a95b4c5239812b2c4a293775c740a with SHA-1 e6c20eee is already in history

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



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