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

Change-Id: Ibfcb6e4b97d57002cc5d807b29a47f98cc04df54