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

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

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



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