Merge "Add EHPLMN and HPLMN to the subinfo database"
am: 577d3c29d7

Change-Id: If4e7308e43c5db8eea0f0fe0e60911e60c8dba33