Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev