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

Change-Id: Ief32e4d6376062ba6e86472e39d84681f562980a