Merge "Re-Number RIL Message IDs to Match RIL.h"
am: 8424001a04

Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9