Merge "only set PhoneStateListener subId for sdk target >=Q" into qt-dev