Merge "Get resource based on subId for multi-SIM" am: 55752cf8d4 am: a784eb71ef
am: 2b7f2fbb5b

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