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

Change-Id: I409e5900488e319f8183a1499811ea2db419775e