Merge "Get resource based on subId for multi-SIM" into qt-r1-dev