am 5b821459: Merge "Adding APIs to get IMEI/MEID" into lmp-dev

* commit '5b8214597f6518132643bcd0ce37fa8d1ff6375a':
  Adding APIs to get IMEI/MEID