Merge "Made bp have higher window priority" into udc-dev am: 53739801 am: 7150161e

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



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