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

Change-Id: Ifd4227647321278a67938979a3eb55ef00d09ba5