Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM"...
Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3d am: c3c41bab -s ours am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d is in history" into qt-qpr1-dev-plus-aosp