Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c