Merge "Revert "Made bp have higher window priority"" into tm-qpr-dev am: 0c85fbe6

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



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