[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1
am: c3c41babff -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d79 is in history

Change-Id: If85845ae5b8af10afdb9422d92cdbf599b294d2f