[automerger skipped] Merge "Ignore the preferredModeId for non-focussed...

[automerger skipped] Merge "Ignore the preferredModeId for non-focussed windows" into tm-qpr-dev am: 66eecc57 am: 0decf11f -s ours

am skip reason: Merged-In Ief48c38ff9dc85c9033d502cc4006130678ae808 with SHA-1 3f864738 is already in history

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



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