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

Change-Id: I89c6875e66f3223a9b86ff0a721694bbaa271937