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

Change-Id: I185109ad67af2bc7ce3e62e14b12bede13afb561