Merge "Add a new column: subscription_type to siminfo table."
am: 141eceb49f

Change-Id: I8a785f7cced4b9e768677029d1437daa7b037871