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

Change-Id: I405bb51787bce13441aa4c3b985ef2b92df18826
tree: 0b73036f5ed79bc324f4862f635b408bb3da1547
  1. core/
  2. services/
  3. tests/