[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 -s ours
am:15e3beb0ce-s ours am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA15f8ac27d79is in history Change-Id: I029b80d595fa8bbb7e5e672489ec4ad5b3ceb816
This commit is contained in: