Merge "Made bp have higher window priority" into tm-qpr-dev am: 89c8a284 am: 08253726

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



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