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

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

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