[automerger skipped] Fix a bug that the uid in getCarrierPrivilegeStatus(int uid) is not used. am: 6a13f2a9ce -s ours

am skip reason: Change-Id I8d8277e86484d07582db6950360eec23bfbd06ae with SHA-1 df0b4cc334 is in history

Change-Id: Iededf6258f007daa6271ebda4672b40820f8411b