Merge "Ignore the prefModeId only for PiP windows, rather than all...

Merge "Ignore the prefModeId only for PiP windows, rather than all non-focussed windows." into tm-qpr-dev am: 7b512154 am: c7c8502b

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



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