Merge "Allow selecting IMEI/MEID text"
am: 5800262b1d

Change-Id: I31e89561466f7586e89f49e5110ff56a3ed262ad