Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev