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

Change-Id: Ibedf0c2e42da973414f90b1250c2434c377b57e0