Merge "BP reason is always higher priority than Settings" into sc-v2-dev am: 969296a67b

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

Change-Id: I8c176124524557d0423fc289eecd6951d84a2312