Merge "Correct issue in unflagged code path for separatelyBindToBtIncallService." into 24D1-dev