Merge "Update getSimCarrierId() document" am: 4e61079a4c

Change-Id: I486690f2cb60629cd864d7acc919df3342a2f6ac