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

Change-Id: Iaffe54fdf263eaf1cc248ceb0dad9b8787861475