Merge "Update getSimCarrierId() document" into rvc-dev am: 4bf8746b40 am: eab99d7eac

Change-Id: Id39d0d2555da713cc3e22633268c5a8730ad4243