[automerger skipped] Merge "Update getSimCarrierId() document" am: 4e61079a4c am: 99fb86a51a -s ours
am skip reason: Change-Id Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3 with SHA-1 18d70ab7b0 is in history
Change-Id: I1730cf15c61939dc88f92862ba1a39974833dd5a
This commit is contained in: