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

Change-Id: I1e69a49c88f6123f735075934f2f2e08f15f2bff