Merge "AML: Make UserHandle.myUserId() available"