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

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