Merge "Merge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79c am: 304f3a74" into oc-dr1-dev-plus-aosp