Merge "Get resource based on subId for multi-SIM" into qt-r1-dev
am: 559e7a3de1

Change-Id: I0183e42f4b116c6fc44147a9ab6ef7d800bd3687