Merge "Deprecated getDeviceId and added getMeid and getImei"
am: 3942335882

Change-Id: I2e6ed9bd8e1d416a4b47e7e4141baf07a26adf06