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

Change-Id: Ia76efd25fa5c9f7f7ec83d67b3e87ff21136674f