Use subId column of raw table.

This is primarily required to include correct subId in intents that
are broadcast for messages in raw table from SmsBroadcastUndelivered.

Test: atest
com.android.internal.telephony.gsm.GsmInboundSmsHandlerTest#testBroadcastUndeliveredMultiSim
Bug: 137124544

Merged-in: I3b02a68658f472714d3be56c91db39dce7404df4
Change-Id: I3b02a68658f472714d3be56c91db39dce7404df4
(cherry picked from commit 38ebba72)