Merge "Add UID APIs to PlatformCompat." am: 2f44b1ebbd
am: db25a1bcf4

Change-Id: Ife2d0e4ee60739fecb11035e05f9eb9bb805db28