Merge "Fix disable flag in QSBH" into sc-v2-dev am: c09887ba23 am: 33b835cb67

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

Change-Id: I4a7df566ca3412f10539da0547fe18cfd1e04c3c